merge trunk
authorK. Handa <handa@gnu.org>
Mon, 11 Mar 2013 09:06:39 +0000 (18:06 +0900)
committerK. Handa <handa@gnu.org>
Mon, 11 Mar 2013 09:06:39 +0000 (18:06 +0900)
commitb5c3987d7be58d061cc427a4ced58c5d2d8a1ef0
tree78cc646a3a226507eb3940b6f303097ea1b1420c
parentf61a7ee163c1d57d0757b3b2f6319d3438f665d9
parent78ad04a6068c6aa36dde556a4fd117183cc36194
merge trunk